Add prefer_shortnames back in.

diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c
index a89bcfe37ed73381a5367cbd80504fa2c9a2883a..9d2f7f53051ea5e88239cdfb01493b087cb3a686 100644 (file)
--- a/gpsbabel/csv_util.c
+++ b/gpsbabel/csv_util.c
@@ -35,6 +35,7 @@
 #define TIMET_TO_EXCEL(a) ((a / 86400.0) + 25569.0)
 
 extern char *xcsv_urlbase;
+extern char *prefer_shortnames;
 
 /*********************************************************************/
 /* csv_stringclean() - remove any unwanted characters from string.   */
@@ -604,6 +605,13 @@ xcsv_waypt_pr(const waypoint *wpt)
         description = csv_stringclean(wpt->description, xcsv_file.badchars);
     }
 
+    if (prefer_shortnames) {
+           if (description) {
+                   xfree(description);
+           }
+           description = shortname;
+    }
+
     i = 0;
     QUEUE_FOR_EACH(xcsv_file.ofield, elem, tmp) {
         fmp = (field_map_t *) elem;

diff --git a/gpsbabel/xcsv.c b/gpsbabel/xcsv.c
index 004413bd50f2f19d2e5c946bedb2c8a48a73c4de..f17d713cf8eb7fd73b8b08de671a7828520dc1bb 100644 (file)
--- a/gpsbabel/xcsv.c
+++ b/gpsbabel/xcsv.c
@@ -35,6 +35,7 @@ static char *snlenopt;
 static char *snwhiteopt;
 static char *snupperopt;
 static char *snuniqueopt;
+char *prefer_shortnames;
 char *xcsv_urlbase;
 
 static
@@ -45,6 +46,7 @@ arglist_t xcsv_args[] = {
        {"snupper", &snupperopt, "(0/1) UPPERCASE synth. shortnames"},
        {"snunique", &snuniqueopt, "(0/1) Make synth. shortnames unique"},
        {"urlbase", &xcsv_urlbase, "Basename prepended to URL on output"},
+       {"prefer_shortnames", &prefer_shortnames, "Use shortname instead of description"},
        {0, 0, 0}
 };